replace g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.

* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_scanner): replace
g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.

* gtk/gtkrc.c (gtk_rc_parse_any): here as well.

diff --git a/ChangeLog b/ChangeLog
index 7a0bef6945155312322eb30f6c5bb77c69b41fcc..8010a2256d2f0dcbf479c7160189fe072a54ab73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-01  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_scanner): replace
+       g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.
+
+       * gtk/gtkrc.c (gtk_rc_parse_any): here as well.
+
 Mon Oct  1 14:07:02 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7a0bef6945155312322eb30f6c5bb77c69b41fcc..8010a2256d2f0dcbf479c7160189fe072a54ab73 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2001-10-01  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_scanner): replace
+       g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.
+
+       * gtk/gtkrc.c (gtk_rc_parse_any): here as well.
+
 Mon Oct  1 14:07:02 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7a0bef6945155312322eb30f6c5bb77c69b41fcc..8010a2256d2f0dcbf479c7160189fe072a54ab73 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2001-10-01  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_scanner): replace
+       g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.
+
+       * gtk/gtkrc.c (gtk_rc_parse_any): here as well.
+
 Mon Oct  1 14:07:02 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7a0bef6945155312322eb30f6c5bb77c69b41fcc..8010a2256d2f0dcbf479c7160189fe072a54ab73 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2001-10-01  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_scanner): replace
+       g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.
+
+       * gtk/gtkrc.c (gtk_rc_parse_any): here as well.
+
 Mon Oct  1 14:07:02 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7a0bef6945155312322eb30f6c5bb77c69b41fcc..8010a2256d2f0dcbf479c7160189fe072a54ab73 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2001-10-01  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_scanner): replace
+       g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.
+
+       * gtk/gtkrc.c (gtk_rc_parse_any): here as well.
+
 Mon Oct  1 14:07:02 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7a0bef6945155312322eb30f6c5bb77c69b41fcc..8010a2256d2f0dcbf479c7160189fe072a54ab73 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2001-10-01  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_scanner): replace
+       g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.
+
+       * gtk/gtkrc.c (gtk_rc_parse_any): here as well.
+
 Mon Oct  1 14:07:02 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7a0bef6945155312322eb30f6c5bb77c69b41fcc..8010a2256d2f0dcbf479c7160189fe072a54ab73 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2001-10-01  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_scanner): replace
+       g_scanner_add/remove_symbol by g_scanner_scope_add/remove_symbol.
+
+       * gtk/gtkrc.c (gtk_rc_parse_any): here as well.
+
 Mon Oct  1 14:07:02 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): change

diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index f14612a3f3ece0c9bcef203089cf3a9fc6260e34..a0b5d33cddbeb52af9f7203bc6136c29a983ccf8 100644 (file)
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -1733,8 +1733,8 @@ gtk_item_factory_parse_rc_scanner (GScanner *scanner)
     gtk_type_class (GTK_TYPE_ITEM_FACTORY);
 
   saved_symbol = g_scanner_lookup_symbol (scanner, "menu-path");
-  g_scanner_remove_symbol (scanner, "menu-path");
-  g_scanner_add_symbol (scanner, "menu-path", gtk_item_factory_parse_menu_path);
+  g_scanner_scope_remove_symbol (scanner, 0, "menu-path");
+  g_scanner_scope_add_symbol (scanner, 0, "menu-path", gtk_item_factory_parse_menu_path);
 
   g_scanner_peek_next_token (scanner);
 
@@ -1747,8 +1747,8 @@ gtk_item_factory_parse_rc_scanner (GScanner *scanner)
       g_scanner_peek_next_token (scanner);
     }
 
-  g_scanner_remove_symbol (scanner, "menu-path");
-  g_scanner_add_symbol (scanner, "menu-path", saved_symbol);
+  g_scanner_scope_remove_symbol (scanner, 0, "menu-path");
+  g_scanner_scope_add_symbol (scanner, 0, "menu-path", saved_symbol);
 }
 
 void

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index ad88bc4597ace131ec8203b6fa3bed224486295f..0985705bce5488187a11c94bc59f9a391e867370 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -1724,7 +1724,7 @@ gtk_rc_parse_any (GtkRcContext *context,
   scanner->input_name = input_name;
 
   for (i = 0; i < G_N_ELEMENTS (symbols); i++)
-    g_scanner_add_symbol (scanner, symbols[i].name, GINT_TO_POINTER (symbols[i].token));
+    g_scanner_scope_add_symbol (scanner, 0, symbols[i].name, GINT_TO_POINTER (symbols[i].token));
   
   done = FALSE;
   while (!done)